From 8ae6ab42b63627bcfec50b2a6a71fbdbc8142c77 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 25 Feb 2002 02:23:00 +0000 Subject: [PATCH] Fix off-by-one error. (Pointed out by Anders Carlsson) Sun Feb 24 21:18:20 2002 Owen Taylor * gtk/gtksocket.c (gtk_socket_end_embedding): Fix off-by-one error. (Pointed out by Anders Carlsson) --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtksocket.c | 4 ++-- 8 files changed, 37 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 424d02702b..9c6c9719c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Feb 24 21:18:20 2002 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_end_embedding): Fix + off-by-one error. (Pointed out by Anders Carlsson) + 2002-02-25 Matthias Clasen * docs/tutorial/gtk-tut.sgml, docs/tutorial/images/*, examples/*: More diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 424d02702b..9c6c9719c5 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sun Feb 24 21:18:20 2002 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_end_embedding): Fix + off-by-one error. (Pointed out by Anders Carlsson) + 2002-02-25 Matthias Clasen * docs/tutorial/gtk-tut.sgml, docs/tutorial/images/*, examples/*: More diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 424d02702b..9c6c9719c5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Feb 24 21:18:20 2002 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_end_embedding): Fix + off-by-one error. (Pointed out by Anders Carlsson) + 2002-02-25 Matthias Clasen * docs/tutorial/gtk-tut.sgml, docs/tutorial/images/*, examples/*: More diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 424d02702b..9c6c9719c5 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sun Feb 24 21:18:20 2002 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_end_embedding): Fix + off-by-one error. (Pointed out by Anders Carlsson) + 2002-02-25 Matthias Clasen * docs/tutorial/gtk-tut.sgml, docs/tutorial/images/*, examples/*: More diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 424d02702b..9c6c9719c5 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Feb 24 21:18:20 2002 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_end_embedding): Fix + off-by-one error. (Pointed out by Anders Carlsson) + 2002-02-25 Matthias Clasen * docs/tutorial/gtk-tut.sgml, docs/tutorial/images/*, examples/*: More diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 424d02702b..9c6c9719c5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Feb 24 21:18:20 2002 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_end_embedding): Fix + off-by-one error. (Pointed out by Anders Carlsson) + 2002-02-25 Matthias Clasen * docs/tutorial/gtk-tut.sgml, docs/tutorial/images/*, examples/*: More diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 424d02702b..9c6c9719c5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Feb 24 21:18:20 2002 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_end_embedding): Fix + off-by-one error. (Pointed out by Anders Carlsson) + 2002-02-25 Matthias Clasen * docs/tutorial/gtk-tut.sgml, docs/tutorial/images/*, examples/*: More diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index 8546b95962..a6d6e1e735 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -368,8 +368,8 @@ gtk_socket_end_embedding (GtkSocket *socket) g_object_unref (socket->plug_window); socket->plug_window = NULL; - /* Remove from end to avoid indexes shiting. This is evil */ - for (i = socket->accel_group->n_accels; i >= 0; i--) + /* Remove from end to avoid indexes shifting. This is evil */ + for (i = socket->accel_group->n_accels - 1; i >= 0; i--) { GtkAccelGroupEntry *accel_entry = &socket->accel_group->priv_accels[i]; gtk_accel_group_disconnect (socket->accel_group, accel_entry->closure); -- 2.30.2